Skip to content

Fix a couple resolve bugs from binder refactor #83944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 16, 2021
Merged

Fix a couple resolve bugs from binder refactor #83944

merged 1 commit into from
Apr 16, 2021

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented Apr 6, 2021

Fixes #83753
Fixes #83907

@rust-highfive
Copy link
Contributor

r? @lcnr

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2021
@jackh726 jackh726 force-pushed the binder-refactor-fix2 branch 2 times, most recently from c94310e to 782da33 Compare April 6, 2021 19:38
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jackh726 jackh726 force-pushed the binder-refactor-fix2 branch from 782da33 to f0c3607 Compare April 6, 2021 20:05
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jackh726 jackh726 force-pushed the binder-refactor-fix2 branch from f0c3607 to 3ae5fed Compare April 6, 2021 21:10
@jackh726 jackh726 mentioned this pull request Apr 15, 2021
Closed
@lcnr
Copy link
Contributor

lcnr commented Apr 16, 2021

this looks good to me

gj and congrats on merging the binder refactor pr ❤️ incredible work

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 16, 2021

📌 Commit 3ae5fed has been approved by lcnr

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 16, 2021
@lcnr
Copy link
Contributor

lcnr commented Apr 16, 2021

while we're here, the comment for that function:

rust/compiler/rustc_resolve/src/late/lifetimes.rs

Line 2641 in 3ae5fed

/// the starting trait `Bar`, we would return `Some(['b, 'a])`.

why does that return Some(['b, 'a]) instead of Some(['a, 'b])?
There are also 2 trait Bar, which is kind of weird 😅

@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 16, 2021
Merged
@jackh726
Copy link
Member Author

while we're here, the comment for that function:

rust/compiler/rustc_resolve/src/late/lifetimes.rs

Line 2641 in 3ae5fed

/// the starting trait `Bar`, we would return `Some(['b, 'a])`.

why does that return Some(['b, 'a]) instead of Some(['a, 'b])?
There are also 2 trait Bar, which is kind of weird 😅

Oops, the second Bar should be the only one. I'll fix that in another PR. Its ['b, 'a] because supertrait hrtbs get appended to the bound vars, so we don't have to shift existing lifetimes.

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2021
@bors
Auto merge of rust-lang#84241 - Dylan-DPC:rollup-jk9nt6k, r=Dylan-DPC
2faef12 
Rollup of 4 pull requests

Successful merges:

 - rust-lang#83337 (rustdoc: Hide item contents, not items)
 - rust-lang#83944 (Fix a couple resolve bugs from binder refactor)
 - rust-lang#84145 (Address comments for vecdeque_binary_search rust-lang#78021)
 - rust-lang#84172 (Compiler error messages: reduce assertiveness of message E0384)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8853aae into rust-lang:master Apr 16, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 16, 2021
@jackh726 jackh726 deleted the binder-refactor-fix2 branch April 16, 2021 17:06
@JohnTitor JohnTitor mentioned this pull request Apr 19, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 22, 2021
@Dylan-DPC
Rollup merge of rust-lang#84377 - jackh726:binder-refactor-fix, r=nik…
c5494aa 
…omatsakis

Followup to rust-lang#83944

Some cleanups requested by `@nikomatsakis`

r? `@nikomatsakis`
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 22, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 22, 2021
@Dylan-DPC
Rollup merge of rust-lang#84377 - jackh726:binder-refactor-fix, r=nik…
9b432e0 
…omatsakis

Followup to rust-lang#83944

Some cleanups requested by ``@nikomatsakis``

r? ``@nikomatsakis``
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 22, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 22, 2021
@bors
Auto merge of rust-lang#84440 - Dylan-DPC:rollup-0xjb8oi, r=Dylan-DPC
5f1aeb5 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#84343 (Remove `ScopeTree::closure_tree`)
 - rust-lang#84376 (Uses flex to fix formatting of h1 at any width)
 - rust-lang#84377 (Followup to rust-lang#83944)
 - rust-lang#84396 (Update LLVM submodule)
 - rust-lang#84402 (Move `sys_common::rwlock::StaticRWLock` etc. to `sys::unix::rwlock`)
 - rust-lang#84404 (Check for intrinsics before coercing to a function pointer)
 - rust-lang#84413 (Remove `sys::args::Args::inner_debug` and use `Debug` instead)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@LeSeulArtichaut LeSeulArtichaut mentioned this pull request May 12, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lcnr lcnr

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.53.0
6 participants
@jackh726 @rust-highfive @rust-log-analyzer @lcnr @bors @rustbot